Use g_mapped_file_unref()

  - drop deprecated use of g_mapped_file_free()
  - bump glib version requirement

diff --git a/configure.in b/configure.in
index fa205a733b5e5dfeb7bb2ac1cc5eca82cb7ff4a6..7249d78962ce1a5f77670845fbd619bb40d7e305 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.19.7])
+m4_define([glib_required_version], [2.21.3])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.13.0])
 m4_define([cairo_required_version], [1.6])

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 75f3ff0ed483f408a2298b5ce5e804dc14f09bb3..6a433fc97cdabe2c556ad0cf71018d49f15dc00e 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -77,7 +77,7 @@ _gtk_icon_cache_unref (GtkIconCache *cache)
                g_print ("unmapping icon cache\n"));
 
       if (cache->map)
-       g_mapped_file_free (cache->map);
+       g_mapped_file_unref (cache->map);
       g_free (cache);
     }
 }
@@ -135,7 +135,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
     {
       if (!_gtk_icon_cache_validate (&info))
         {
-          g_mapped_file_free (map);
+          g_mapped_file_unref (map);
           g_warning ("Icon cache '%s' is invalid\n", cache_filename);
 
           goto done;

diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index edd68c03cf8a0684ecc239606a990e56686f42e6..627f49eb808a9e5d8ee0f25b37b2b4ea2434c7a7 100644 (file)
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1415,11 +1415,11 @@ validate_file (const gchar *file)
 
   if (!_gtk_icon_cache_validate (&info)) 
     {
-      g_mapped_file_free (map);
+      g_mapped_file_unref (map);
       return FALSE;
     }
   
-  g_mapped_file_free (map);
+  g_mapped_file_unref (map);
 
   return TRUE;
 }